Conditionally include $(GNOME_LIBS) here.

1999-12-07  Martin Baulig  <martin@home-of-linux.org>

	* gdk-pixbuf/Makefile.am (testpixbuf_LDADD): Conditionally
	include $(GNOME_LIBS) here.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index fd8f4c353be69ebbb526013d3335ef2c4bbc8793..54c9ba2841dc94d1dd29325ad6900bd60234f9ad 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-07  Martin Baulig  <martin@home-of-linux.org>
+
+       * gdk-pixbuf/Makefile.am (testpixbuf_LDADD): Conditionally
+       include $(GNOME_LIBS) here.
+
 1999-12-05  Arjan van de Ven <arjan@fenrus.demon.nl>
 
        Added missing "include <string.h>" to:

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index e17bfb5cb9b4014ec53977da1d14a69aedd209b2..5e628364a3306e00a2335862df47f2a0f070e77d 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -48,7 +48,11 @@ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
 
 LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
+if INSIDE_GNOME_LIBS
+testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) -lgmodule
+else
 testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule
+endif
 
 #testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)